Merge "OPP: Prevent sending intent while orientation change" am: f32fa0b5f6
am: def626bea0

Change-Id: I811e1801a145e9bb010359fdb8c74fb8ca968e7d