Patch set update

Prevent overridePendingTransition option

Change-Id: Id360abe158d36ab85c1c0d0103428d4a8867e70c