Merge "Remove unnecessary mScreenAcquired"