Merge "Set quick_qs_offset_height to 48dp in waterfall" into sc-dev