Merge "Merge "Remove SystemUIFactory.getHomeLayoutId()" into nyc-mr1-dev am: 84c074adb2" into nyc-mr1-dev-plus-aosp