Merge \\"Performance Optimization: Align texture dirty rect\\" am: 4e6a73c16a
am: ec45adde70

Change-Id: Ice5c2f216dab71fe26b07f9299f8c4300b80f665