Merge "Override statusBar top inset in Launcher" into tm-dev