Merge \"Updating the allow rotation settings text\" into ub-launcher3-calgary
am: ab7a50ea1a

Change-Id: If56db6408c7a7073f0afb918b8070ac6c5744d69