Merge "Revert FM: Fix dialog will be closed after rotating screen."