Merge "Setup wizard status only available on Lollipop++"