This reverts commit 5175580c. Reason for revert: Scale issue with play movies Bug: 156669445 Change-Id: I1393d802209163f8a415073dd1432cc35dba90f7