Merge "Add support for SystemProperty flags to SysUI." into tm-dev