Merge "Merge "apply empty transaction in startActivitySync" into qt-dev am: f928b661 am: 5cd874d7 am: 5d138b1d" into qt-qpr1-dev-plus-aosp