Merge "Update scaled padding for all devices" into tm-dev