Always show development and performance options

Change-Id: I8e6c39e759805ca6f28e3afd7ea964eeb6363745
Merge branch 'sgt7' into CM10.1