Merge "Insulate SystemUI from IDs in inflated notification views."