am 96fecb7f: Merge "Make immersive mode public & imply update locking" into ics-aah

* commit '96fecb7f6b74176c0fad7bfa2c7ae9b80e1770cc':
  Make immersive mode public & imply update locking