Merge "Fixed window ordering issue with TYPE_VOICE_INTERACTION."