Merge "Consider padding when measuring AllApps in SecondaryDragLayer" into tm-dev