Merge "Always remove unhide flags while pretending callback from SystemUI"