Merge "Remove grant flags before forward to other activity"