Merge changes I31d9a51e,I1bc14be7 into main

* changes:
  Prevent requestLayout() when updating drawables that don't change size
  Fix splash icon size to 52dp