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

Change-Id: I5312fe5725cf8c7055f34fdda1149e940b535c38