Merge "DisplayController should deep compare mPerDisplayBounds" into udc-qpr-dev