Fixed some bugs related to latest Android Nougat (7.1).