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