am 3b83dc42: Merge "Fix launcher invisibility bug" into jb-dev

* commit '3b83dc42df8d2d2b97bfa63a00f2d0c742fe8dfc':
  Fix launcher invisibility bug