Merge "Fix the wrong focus indicator position after dismissing popup" into devel...