Merge "Remove SystemUIFactory.getHomeLayoutId()" into nyc-mr1-dev