am 534de491: Merge "Make immersive mode public & imply update locking" into jb-mr1-aah-dev

* commit '534de491e6522465a7ad12d7cba9b2f80deab364':
  Make immersive mode public & imply update locking