Merge "Fix a bug that an activity occluding the keygaurd keeps running behind AOD."