Fix location button text - #8319
Merge branch '8319_fix_appforms_location_button_text'