am cc935071: Merge "DO NOT MERGE Set force hiding differently" into jb-dev

* commit 'cc93507124855591be40af55a94deeb33d74e719':
  DO NOT MERGE Set force hiding differently