Stock mode: reintroduce with better nomenclature and set default behavior to off

PS2: fix twisted logic for development shortcut option

This reverts commit 74718c5324a1244b3182facfa78de16d6cbff21c.

Change-Id: I13d583bad10ac78cf5df35937d5b1475dabb82d1