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

Change-Id: I0d5a7576d0f1e6d2aee25db615a2459827127be1