Selecting a different shader and changing back to standard on a Material opens additional settings and Texture boxes

Steps to reproduce:
1. Create a new project
2. Create a new material
3. Change shader to anything besides standard(e.g. Skybox sided)

Expected reuslt: Standard shader setting appear
Actual result: completely different settings and selections for texture appear

Reproduced on 2017.1.0b1
Not reproduced on 2017.0a4
Regression introduced in 2017.0a5

Notes:
-This goes away after unselecting away from the material

Verified FIXED 2017.1.0b4