Merge "Exclude scrim padding when calculating stack height on lockscreen" into sc-dev