Merge "Add CTS test for Theme.rebase()" into mnc-dev