Update RB Settings & Update Center Icons
Revert "Fix lockscreen delay stuck at 5 seconds for Pattern/Pin/Password Lock"

This reverts commit 48901554a045062af0669c74b488715a035d0474.
Merge remote-tracking branch 'awa/jb-mr1' into jb-mr1

Conflicts:
	res/xml/settings_headers.xml