am 03bdcfa5: Merge "Ensure theme attributes are set appropriately"

* commit '03bdcfa519766ffe9d331d176eae8c77452bc4ff':
  Ensure theme attributes are set appropriately