Merge "Suppress quick settings if setup has not been completed." into jb-mr1.1-dev