Merge "Move clock down 4dp in QS header" into nyc-dev