Merge "Adding tracking for widget updates during unlock"