Merge pull request #3712 from koying/adddroidimmersive