Merge "Setting content bounds in onMeasure as it uses measuredWidth, which might...

am: 5df98da8fd

* commit '5df98da8fd2c1997bd6c09a4772f018730345090':
  Setting content bounds in onMeasure as it uses measuredWidth, which might not be available during onCreate

diff --cc src/com/android/launcher3/BaseContainerView.java
Simple merge

diff --cc src/com/android/launcher3/DeviceProfile.java
Simple merge

diff --cc src/com/android/launcher3/allapps/AllAppsContainerView.java
Simple merge