Merge "Don't take activity options that contain remote animation" into qt-dev
am: bee66a362c

Change-Id: Ieda0cf593381bb27587895384849a3fac1e38e50