Merge "Fixed issue with activity states on products that support swipeToDismiss" into pi-dev am: d3965a0246
am: e92e4ac066

Change-Id: I2ceef1b7a836ee83c6213805e2f70439a10d0f71