Merge "Move moveable non-public framework resources up to SystemUI"