Merge "Use ninepatch for indicator background." into gb-ub-photos-denali