Bug Fix for All Android Compatibility Issues