Fixed issue with focus transferring from one activity to the other (keyboard issue)