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

Change-Id: Ife4e8eb5e4029db6fc24fa9bf8b5f4291a0f5602