Merge "Fix exception in key missing dialog when rotating screen" into main