Merge "Prevent app bar title from drawing twice" into sc-dev