Merge "DO NOT MERGE: Revert "Add summary text to Display->Brightness level."" into oc-dev