Merge "No decoration for WifiSetup activity used by SetupWizard" into jb-mr1-dev