Merge branch 'features/JAL-4034_improve_3dbeacons_button_and_ux' into develop