Make refocus and hdr+ sticky on mode change.

Bug: 12413073
Bug: 12368672
Change-Id: I151581c73bafbf307889b6aa19131c4add400ba9
3 files changed