Merge "Increase notification icon shelf height 32dp => 48dp" into sc-dev