Merge "Fix a bug regarding layout-unable Scroll in CANotifyOnBootActivity Class." into klp-dev