Merge "Add back elevation to quick settings" into nyc-dev