Merge "Show big text on AoD" into oc-mr1-dev