development: Add setting for overwriting recovery

Change-Id: I1ffa1735cd29bcdd5f7be419e4b46cf04a3f9973
Merge branch 'cm-11.0' into cm-11.0-sc