Merge "Remove unnecessary theme attribute for Sync Test"