Merge "Enable flagging shortcut with no_user_action flag" into tm-qpr-dev