There are multiple settings that have similar behaviour. So you need to disable all of them to do what you want. They are fairly obvious settings, you just need to take a minute or two to flip through the settings menu pages.
Another thing to try if you have any anomalous or unexpected behaviour is to wipe the system cache from recovery mode. This has no significant downside other than one longer than normal boot and will resolve a lot of one time glitches.
In the alternative, you could do a factory data reset but as you surmise that is a more drastic step and will delete user settings and files.
Last edited by fffft; 3rd September 2014 at 10:25 PM.