Merge branch 'staging' into 671-implement-explanation-modals-for-the-my-bonus-stars-and-bonus-archive-dialogs