Merge "Correct the app bar color theme of Digital Assistant app" into sc-dev