Merge "Enable app name to show up to 2 lines" into sc-dev