Merge branch 'release/2.5' into develop
[Client] Fixed: Anno text is not properly visible in annotation
[Client] Minor bug fix
[Client] Minor UI fix related to screenshot controls
[Client] Calling 'resetDetailPage' on clicking of 'navBtnTdBackScreenshot' button
[Client] Fixed minor bug related to AnnoUpdate
[Android] Bumped version
[iOS] Bumped version
Merge branch 'release/2.6'