Merge "Null reference to activity as runnable back handler" into main