Smart MainActivity name in shortcut fix

Change-Id: I7918c0009cace459d2579bd67bea48ad80824a05