Force merging the master branch into the androidui branch