Update for AndroidStudioBeta & Add checking current fragment