Merge "Replace button_dismiss with dismiss_button" into rvc-dev