Merge commit '1f432b19203b86a2b4da825943024c5b01eaeb60' * commit '1f432b19203b86a2b4da825943024c5b01eaeb60': Fix a couple issues with the new hwcomposer HAL
Merge commit '1f432b19203b86a2b4da825943024c5b01eaeb60' * commit '1f432b19203b86a2b4da825943024c5b01eaeb60': Fix a couple issues with the new hwcomposer HAL