Merge "Fix for button flickering issue when video call screen rotates" am: 890dcce1a5 am: fc10e63786
am: efe0fce79f

Change-Id: Iab022c32c517563ad2956bacceb22f320a2f6ac8