code cleanup

Change-Id: Ia28c45857f586d5a96d6cfa96e42e0d68bdef9b8
Smart MainActivity name in shortcut fix

Change-Id: I7918c0009cace459d2579bd67bea48ad80824a05