Merge "Add null check before finish SystemUI Tuner's activity"