Guidelines cleanup for some immersive stuffs.

PS2: Also fix a logic derp when calculating display size.

Signed-off-by: Carlo Savignano <stevewatersy@gmail.com>
Change-Id: Iec47fcd47b0ae93e404ff146c9cdbcfd8cbd0007