Merge "Adds new activity flags to the @Flags annotation." into rvc-dev