Fix compilation warnings.

Change-Id: I77ec17fbac717010aff34f015ed2cfc6c13281ad
Merge topic 'view-settings' into next

a48430e3 Fix compilation warnings.