Android studio project to master merge

Please review it
Agreed to watchingImageView_