Merge "OPP: Prevent sending intent while orientation change"