Merge "Revert "[Quickstart] Turn off QS on legacy Pixels" am: 2e8d17501d am: 59c9979314"