[TASK] Improve Code quality of CmsLayout hook

Change-Id: I128332a8ce97b7ee4f9a929907a711bd919514b0