Fix for current activity refresh

Change-Id: Ifae4b4991af2ad8945b7f295e76956d56629aefc
Merge branch 'cm' into HEAD