Merge "Enable flagging shortcut with additional activity flags" into tm-qpr-dev